Revert b8a5e1d..27b4f2c

This rolls back to commit b8a5e1d03d59a5c7dbf28e405e6e2d4ac0ab76a6.