Revert ffa939d..e5bd2ae

This rolls back to commit ffa939d26620a2ea134e01f6d7eb47f322a83b88.