Revert 90ab397..6c0a62d

This rolls back to commit 90ab3974e392942880ad6408b56124a041f3835f.