Revert 5eebba3..7b8396d

This rolls back to commit 5eebba38ade9affdc0184f1c999f1b70af95ce59.