Revert b59cdf3..22d02d8

This rolls back to commit b59cdf33ca1c9a474469bd82dbc28845fc8b8791.
Reverted to build: b59cd