Revert 2674e40..0935f91

This rolls back to commit 2674e40df04b6f4c656a794024c1bc8cc89dc2f6.