Revert "Commit changes from master and myself"

This reverts commit c05bff27827fe1a573ff5257ccf6b2db7f071fc6.