Revert 7afeb80..ea5647d

This rolls back to commit 7afeb805f4dd598054593bb8bf3dcd6e307e7fce.