Revert "Merged with developer's clone"

This reverts commit a53e401f9f200b3c95571675082b0624510d766d.