Revert "Merging Buildings with Master"

This reverts commit 8c79af53b63679eb40eed8ad5a5249ec17646eb0, reversing
changes made to 39737a661d55e8d2434b7f08138344c08ff165fb.