Revert f9d87ff..5fd28a1

This rolls back to commit f9d87ffff5f583a48778572a02c5c2af112c03f8.