Revert 19849ac..c672811

This rolls back to commit 19849ac3a136955d19de796b1cc9d7291537bc94.
Removed.