Revert 574721d..24ad6f4

This rolls back to commit 574721da3eb271381d4d55289f3f9b4f0f63924e.