Revert 53a1487..3c8e17c

This rolls back to commit 53a148715ec0f5df54df5472a90a5cad6be291a1.
Revert 53a1487..55f7310

This rolls back to commit 53a148715ec0f5df54df5472a90a5cad6be291a1.