Revert b69bd3c..7d16030

This rolls back to commit b69bd3c3ccb15d4168e8e21f56000dc15d80c54f.