Revert ecdc789..44ae04c

This rolls back to commit ecdc789cfd4424948ffc343a9519b4f966be3734.