Revert 845f9f3..795899e

This rolls back to commit 845f9f37089089c702fe8cdb6fcf1a73eeff848b.
Changes done offline