Revert 1e81fec..c139b24

This rolls back to commit 1e81fec743c006af1d7935af6d5fc13e9d4a3e88.