Revert 8fa4953..502f0cc

This rolls back to commit 8fa4953735574e374e9ca3dda55ea7bc51038d18.