Revert "Richard commit 1"

This reverts commit 3395a78cfa8c59ec24f08df468a09617d7742fde.