Revert 3c121a0..cdc3e18

This rolls back to commit 3c121a0cf8aa0d1d95c92f8ac53645dbe46239b4.