Revert 706103d..ca503f2

This rolls back to commit 706103d3ac728041db40b8f45e1ec4d90c419379.
Revert "Revert 706103d..ca503f2"

This reverts commit 2c88cd5c247f9a259c87a3bd1d897afadd18c75b.
Revert "Minor change 2"

This reverts commit ca503f256b0e7a2029b3d9a830328be9b7e3e639.
Fixes