Revert 12b6b58..cea3832

This rolls back to commit 12b6b586c7a747f110769f73e8314e4c7147c2e9.