Revert 3ae130f..972553f

This rolls back to commit 3ae130fd8bf01641371b83b2671b0375a95ee94f.