Revert f6bc77d..e290afb

This rolls back to commit f6bc77db1d53dded14dc3648ba6473ec9a0d5ec5.