Revert 91b1ada..64fec18

This rolls back to commit 91b1ada19dd38688f8cc2431de7e56f07b509cfc.