This should get removed as it results in a now unnecessary request back to the server.