Revert 2339488..02f6bf2

This rolls back to commit 23394886b657894687febbf493eb38bcb89b40aa.