Revert 3bb6f5c..dd33f31

This rolls back to commit 3bb6f5cb201138c8f6c3dc276cd59b5d964c8d6e.