Revert 764eaad..4432687

This rolls back to commit 764eaad328605148d14c9f33b33f0f1ec7f3d053.