Revert b1c766c..44df7cf

This rolls back to commit b1c766c46da6b69044d13a9788f82de467752909.