Revert 505443a..ef57fc9

This rolls back to commit 505443adcff2803f3bc8c8fde7402f5281a19497.