Revert 2a21dd3..a61f912

This rolls back to commit 2a21dd3dd01bd10a185d349f4ace5abe1d0ef66b.