Revert 3470824..b4a25f3

This rolls back to commit 3470824f8eb0761fd71c8170e5c37f09d23c127e.