Revert f4ec5ab..f47d0d7

This rolls back to commit f4ec5abe6e3f5725094211a964e6f1e38f9d6226.