Revert c6b5558..140b5de

This rolls back to commit c6b5558830803e4114b5eeed2450641b774981df.