Revert ef9c05c..5d627e7

This rolls back to commit ef9c05c5e7e5c7656c5f1f07d636b253f5ae4e67.