Revert "Merge branch 'ryerson-history'"

This reverts commit a554c6f72c17f4e978967f2c0fe5292b52c42066, reversing
changes made to 2a0c9769aa7cbdb9cb25c045bd275f04ba430ae8.
trying to fix master..
Merge branch 'master' into 2.5.x