Revert 6cd1a90..a475520

This rolls back to commit 6cd1a90c7f584a446a3d8b3971ac506615a04dca.