[NO MERGE PLS] Revert #645, #646

Reverts two pull requests, hopefully:
 * #645 
 * #646 

Do not merge.