Revert 5aaa9eb..3b05aa7

This rolls back to commit 5aaa9ebb1ba08f1769dc9fa6d4d3da4d34aa6063.