Revert 19bdb2a..b3f0bae

This rolls back to commit 19bdb2a8100b9f44245212cdc133c0d881f95455.
Revert 204a567..602044e

This rolls back to commit 204a5670ae089097473141037ec2b1e349fd6425.