Revert 7261a26..a40aa1c

This rolls back to commit 7261a260683dc8430bd63fdee0acde27a5e5a744.