Re-added previous committed changes