Revert c77ba06..997c0ad

This rolls back to commit c77ba06a8e857887154be67e419377b45f83f210.