Revert ac5ca2b..3fe5b9e

This rolls back to commit ac5ca2b492c7b79d02364323fa6e3449b8dbe08a.