Revert 355cd47..03ce3ec

This rolls back to commit 355cd475815ec29519e7db26626119312e3da6cb.