Revert b40d44d..e65cf3c

This rolls back to commit b40d44df73d648ff9d9a0fe39f31425a4de87cee.