Revert e73d911..71fc336

This rolls back to commit e73d911d278b4578594a12040a8f23f00e31255d.
Revert f2b3441..ee0797b

This rolls back to commit f2b3441867e74ab00f93dc10c8176be95d10ac20.
Reverting back to earlier commit

This reverts commit 71fc33668e0004a43210df318194996c0b6a9f3b.