Revert f10fed4..b549abe

This rolls back to commit f10fed4eae85892560abedc0b31bb93892bafbfb.