Revert bed8f68..ea80d97

This rolls back to commit bed8f68fde94eac01101e16e92e0874dcae6253b.