Revert 8a1f106..2e1a1c3

This rolls back to commit 8a1f106499fe3cf16672cce4296e37e8c64a659c.