Revert 4a57341..1a5ca5c

This rolls back to commit 4a5734140d4f55604932e98c4cf25bfd57bda734.