Revert 4d8479f..adf8ca1

This rolls back to commit 4d8479f4c306754873a359e98104394e6135303c.
Revert bad commit