Revert 9925dcf..d517aa1

This rolls back to commit 9925dcff177114dad333c63538c8d283f90a6fee.