Revert 6288400..d74a258

This rolls back to commit 6288400b3ed96d6ae8b09d99534a2d6cd3de08f4.