Revert 4511806..6a369cc

This rolls back to commit 4511806f37036afd47d664efc178ab291b0a7ace.