Revert 38dc7d0..abb054a

This rolls back to commit 38dc7d0df8e4552bcc20193287f5b2cd2dede6e7.