Revert 4ba78be..d394e63

This rolls back to commit 4ba78bebc4d26b05453026094f1856d227b59f7d.