Revert eb2cfe0..b89b71f

This rolls back to commit eb2cfe0a4d8e42ace5470d5242fec705039763af.