crppy fixes
Revert 99a5aa6..0118721

This rolls back to commit 99a5aa659fc08beb134fd10d7195ad1f1304c3a8.