Revert "3.913 merge (messy)"

This reverts commit c3ee38d3f586e7116d855b6ea8d429601bccf9e6.