Revert d4ca7a3..9857e6f

This rolls back to commit d4ca7a38d4683cc9f21081da05127735844e9303.