Revert 787af20..0dbeddb

This rolls back to commit 787af20099c347af42a7f4568e4523e838f95bd3.