Revert "Merge pull request #1540 from realm/dp/minor-cleanup"
Revert "Merge pull request #1540 from realm/dp/minor-cleanup"

This reverts commit 610b0f041cf2f65dfeab67fc570cd8b61e09139c, reversing
changes made to bf70eec3d3b3c2a65cf105e2cb2689ae82294c7a.

realm/realm-core,realm/realm-core,realm/realm-core,realm/realm-core,realm/realm-core,realm/realm-core,realm/realm-core