Revert dec3f31..d1cbf35

This rolls back to commit dec3f31673098feb2d773fbc05b4c7edc5f04404.