Revert 7b563f4..03b04c9

This rolls back to commit 7b563f4810a994ed9617ca35ee6943394a0fd186.