Revert b381211..b289319

This rolls back to commit b3812118fdadc044e0996307ba9f669544e97fd1.