Revert c64e4d4..297120a

This rolls back to commit c64e4d45435c8a395502488cc3a46d9468d88098.
reliase