Revert 06e6999..af733bc

This rolls back to commit 06e699977edf4516b719c34c2d74f8438974e7e8.