Revert 8e81837..fc63596

This rolls back to commit 8e81837d1c6daaa5d255226df02f6252a46d3ddb.