Revert d1a877a..00f4a29

This rolls back to commit d1a877aa0fde936a1755bd8b44b40dc86d844cb7.