Revert 737143c..dd59a31

This rolls back to commit 737143ce0b0d093f2da85126fbf9faca1cee54ad.
Revert dd59a31..4b142ef

This rolls back to commit dd59a310595a31824dbb853885592099fd275d68.