Revert 49c5efb..09be92a

This rolls back to commit 49c5efbd3ae63e5e0d19b122590510f3626c15fd.