Revert 5489a6a..644bb67

This rolls back to commit 5489a6acab69186c7a09edf7570e9f298edee0f7.