Revert 63ed85c..e12cabe

This rolls back to commit 63ed85c58944cfce8487bfeefeda5daeb248b270.