Revert 24f9511..ecd9830

This rolls back to commit 24f9511cb08422104bd15b3a5ca194d75d3b672a.