Revert b14b7bf..2c6c9dc

This rolls back to commit b14b7bf99b49484095c24e1b8576d5b8541b00d5.