Revert 7c7b473..28b8289

This rolls back to commit 7c7b4736f7405ab13835dd1812dce5552d69810e.