Revert a82d294..bd95955

This rolls back to commit a82d2943aa7005b1bde8b2ea8e13ab5a05aeb35c.