Revert 66c2af3..6cd9278

This rolls back to commit 66c2af332ff8291531cb7c9cf98d0a7c2d074c98.