Revert 6371cf1..053a094

This rolls back to commit 6371cf16521ffcead83c0b269e8c9446e3803c5e.