Rolled back for awesome3.4