Revert 367eedc..d2a4f58

This rolls back to commit 367eedc29e6989b502764881b3694ee4beb5ec03.
Fix the render row issue