Revert dbd1e2d..f9b5eed

This rolls back to commit dbd1e2d2b665fb9342284135193681913036bf86.