Revert b0c094d..381a19d

This rolls back to commit b0c094d1f0c522c54ce834b9e154a96ce79224a7.