Revert 435788a..73e7fba

This rolls back to commit 435788a65f12060a9c246f5276e890acaf0e8444.