Revert 97b7e04..14c3480

This rolls back to commit 97b7e04a326d2ced81b8130fd9f6d9477dc757af.