Revert cb7389f..c13a1f1

This rolls back to commit cb7389f2cfc9d255e434f4d54e1730eb7cd72f25.