Revert 17c5039..1245ea0

This rolls back to commit 17c50393c2ed5f07b78049198446522bd3bea48d.