Revert changes intended for separate branch

This reverts commit e22fb02f11b42b162701d9469b5906f904d77b1f.