Revert 58bada7..978d4f5

This rolls back to commit 58bada7739a6d30128dfde0bdbf05c7af9e1f773.