Revert a38c150..acba57c

This rolls back to commit a38c1500a8298b00a14a64c8eafbaa35b8ab72d5.