Revert fb69d3e..9d5f476

This rolls back to commit fb69d3e6a0da1623bfc3df4760cc3d56539363ab.