Revert 92249f6..6046ffb

This rolls back to commit 92249f6805a83dfc833032fb6eb645091a02172f.