Revert af7cc20..db452a8

This rolls back to commit af7cc204892771a6fe65a8f37f7651ed4cba0dcc.