Revert a299cae..5d2fb70

This rolls back to commit a299caef0756328d310b42d4465d2d621911b024.
First Commit