Revert 5477f71..753dacf

This rolls back to commit 5477f719a7c337853358aac9474692d7fa37bf46.