Revert e512611..0e49b2d

This rolls back to commit e5126119d59727bc90c6ce0a379c82dcc3907029.