Revert 7f657dd..a5d8b24

This rolls back to commit 7f657dd22ac20d22698c53b23f0057e1a12c09b7.