Revert c1e7557..bdb79a1

This rolls back to commit c1e755707760b1b92681baba63792574bd2055a8.