Revert 113cdff..c472f64

This rolls back to commit 113cdff544168b3c9cc330378f769a15eab64667.