Revert 63e71c2..1de6682

This rolls back to commit 63e71c268a7534f17e8595b8c50bd81fbae84848.